Merge branch 'emacs-26' into scratch/org-mode-merge
authorRasmus <rasmus@gmx.us>
Fri, 29 Sep 2017 08:41:51 +0000 (10:41 +0200)
committerRasmus <rasmus@gmx.us>
Fri, 29 Sep 2017 08:41:51 +0000 (10:41 +0200)

Trivial merge